Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 15 Jan 2012 06:41:53 +0000 (22:41 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 15 Jan 2012 06:41:53 +0000 (22:41 -0800)
commit18b61d4152ec81a402b1139020def9f7c8998d6e
treefb9eeede135aed5cdc5bb5ba02f92fa0f356a863
parent41ce13d62f9413d1c2253b89ebc167b83b4bb561
parent2a5e4343fa809f96552e349e7bc410c321f0271c
Merge from trunk.
src/ChangeLog
src/bidi.c
src/dispnew.c
src/emacs.c
src/keyboard.c
src/lread.c
src/w32fns.c
src/xdisp.c